From: Peter Michael Green Date: Sun, 12 Jan 2020 00:58:50 +0000 (+0000) Subject: Merge slightly patched 14.2.5-3 into bullseye-staging X-Git-Tag: archive/raspbian/14.2.5-3+rpi1~6 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=4ffbb295ad80897d5c43398ab3521f9e58d60aef;p=ceph.git Merge slightly patched 14.2.5-3 into bullseye-staging --- 4ffbb295ad80897d5c43398ab3521f9e58d60aef diff --cc debian/changelog index edc391e08,135de75b8..454e87a6f --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,323 +1,336 @@@ - ceph (12.2.11+dfsg1-2.1+rpi1) buster-staging; urgency=medium ++ceph (14.2.5-3+rpi1) buster-staging; urgency=medium + + [changes brought forward from 10.2.5-7.2+rpi1 by Peter Michael Green at Sun, 30 Jul 2017 09:48:17 +0000] + * Add Raspbian to lists of "debian-like" distros. + + Hopefully this will fix site-packages vs dist-packages + build failure in Raspbian. ++ ++ [changes introduced in 14.2.5-3+rpi1 by Peter Michael Green] ++ * Remove problematic gitattributes files. + - -- Raspbian forward porter Thu, 11 Apr 2019 06:20:48 +0000 ++ -- Raspbian forward porter Sun, 12 Jan 2020 00:53:17 +0000 + + ceph (14.2.5-3) unstable; urgency=medium + + * Uploading to unstable + + * [010db9a] Fix ceph-mgr - indefinite queue growth hangs. + Applying the backport for the fix + https://github.com/ceph/ceph/pull/32466 + Thanks to Milan Kupcevic (Closes: #947969) + * [b01de37] Merge branch 'debian/unstable' into debian/experimental + * [c8f35e5] Add breaks/replaces for ceph-common - ceph mds. + * [ee905cb] Revert "Configure gbp for experimental" + This reverts commit 3bcd5ac5f416b902a868036c243d7f19752c82f8. + * [6303513] Revert "CI: build in experimental" + This reverts commit d481122833e611c69c28e2b381e1cc1c8f689385. + * [f1a9482] Snapshot changelog + * [6e955c8] Removing automatic Ubuntu header + * [b90d95a] Mark patch as forwarded + + -- Bernd Zeimetz Tue, 07 Jan 2020 20:50:28 +0100 + + ceph (14.2.5-2) experimental; urgency=medium + + * [8c74414] lower --max-parallel for >=16GB + g++ loves to eat ram + * [b15dcdd] Build-dep. on python3-dev instead python3-all-dev. + Thanks to Graham Inggs (Closes: #948021) + * [d481122] CI: build in experimental + * [4303a75] 32bit: fix more size_t vs uint64_t issues. + * [c98ea07] Install bash-completion in /usr again. + This change went missing somewhere during the import of the + changes done in Ubuntu between 12.2.11 and 14.2.4. + Thanks to Andreas Beckmann (Closes: #948165) + * [c7d90b9] Move manpages to ceph-common again. + This also went missing during the import. + * [3e5a680] Use a better way to check if we are on 32bit. + * [c03cd06] rm d/p/boost-py37-compat.patch. + Upstream renamed assert.h to ceph_assert.h, so this patch should not be + necessary anymore. + + -- Bernd Zeimetz Sun, 05 Jan 2020 00:04:23 +0100 + + ceph (14.2.5-1) experimental; urgency=medium + + [ Bernd Zeimetz ] + * [3bcd5ac] Configure gbp for experimental + * [bd0b051] New upstream version 14.2.5 + * [46cbe61] Merge upstream changes for 14.2.5 + * [4dfd819] Refreshing patches + * [da26f25] Fix copy&paste errors in build-deps. + * [7ff43a2] Mark build-deps needed for make check. + And remove the need to install them. + * [5ef8ac3] Remove left over patch file + * [91ab5b9] */lib_tp.so files are not built, don't install them. + * [44591e4] Don't try to install files we don't build + * [db0994e] librbd1.symbols: add new symbols. + * [d53724e] Add install/postinstall files for ceph-mgr-k8sevents + * [acada37] Add lintian override for .chm file. + Source and build info is shipped. + * [bbb0bd6] copy the radosgw init file in override_dh_installinit. + * [a5958d5] Avoid duplicate files. + etc/bash_completion.d/ceph was accidentally shipped in ceph-base again. + * [fbc33a3] Add missing > in Dependency. + + -- Bernd Zeimetz Thu, 02 Jan 2020 10:52:50 +0100 + + ceph (14.2.4-9) unstable; urgency=medium + + * [8c74414] lower --max-parallel for >=16GB + g++ loves to eat ram + * [b15dcdd] Build-dep. on python3-dev instead python3-all-dev. + Thanks to Graham Inggs (Closes: #948021) + * [c98ea07] Install bash-completion in /usr again. + This change went missing somewhere during the import of the + changes done in Ubuntu between 12.2.11 and 14.2.4. + Thanks to Andreas Beckmann (Closes: #948165) + * [c7d90b9] Move manpages to ceph-common again. + This also went missing during the import. + + -- Bernd Zeimetz Sun, 05 Jan 2020 00:22:21 +0100 + + ceph (14.2.4-8) unstable; urgency=medium + + * [e187e6a] Use WITH_CCACHE from cmake to build with ccache. + * [8cbe25e] Hack CMakeCache.txt to disable HAVE_ARM_NEON on armel. + after trying to patch the various places where HAVE_ARM_NEON is used + the easiest way to get rid of it on armel seems to be to patch the cmake + cache file. + * [424ea9b] Don't build ceph on mipsel. + No compiler is able to build the code without running into oom-issues. + + -- Bernd Zeimetz Wed, 01 Jan 2020 19:29:48 +0100 + + ceph (14.2.4-7) unstable; urgency=medium + + * [9b97753] Make sure we use ccache if needed. + * [3dbd1ac] d/rules: Remove the armel fpu options. + Hopefully properly patched now. + * [da253e4] m68k, sh4: build with clang to avoid gcc OOM. + + -- Bernd Zeimetz Tue, 31 Dec 2019 00:13:23 +0100 + + ceph (14.2.4-6) unstable; urgency=medium + + * [b1c9b5d] Try to reduce memory usage even further if needed. + gcc loves to eat too much memory on armhf mipsel armel. + * [d695778] Remove softfp patch in favour of build flags. + This hopefully avoids the need to update and debug the patch. + * [6eddb32] Build with clang(++) on armhf mipsel armel. + Reports seem to suggest that clang does not need as much memory as gcc. + * [b9420ba] Fix unsigned/size_t issue for sh4 & m86k. + * [0027181] Updating changelog + * [6502f60] Fix another 32bit size_t/uint64_t issue. + In src/common/options.cc line 192. + * [4a0b044] Fix another 32bit size_t/uint64_t issue. + This time: powerpc. + + -- Bernd Zeimetz Sun, 29 Dec 2019 17:38:10 +0100 + + ceph (14.2.4-5) unstable; urgency=medium + + [ Bernd Zeimetz ] + * [453eaa4] Avoid using make -j 32 on powerpc. + A lot of CPU do not always help. + + [ Milan Kupcevic ] + * [c6ec924] cherry pick critical bluestore data corruption fix + (Closes: #947457) + + [ Bernd Zeimetz ] + * [e88fc21] Set -DWITH_BOOST_CONTEXT=OFF where necessary. + [!s390x !mips64el !ia64 !m68k !ppc64 !riscv64 !sh4 !sparc64 !x32] + + -- Bernd Zeimetz Sat, 28 Dec 2019 15:54:51 +0100 + + ceph (14.2.4-4) unstable; urgency=medium + + * [b70efb1] Create missing directories for arch:all build. + * [3e4530f] try to save even more memory on armhf. + Don't build debug flags at all. + * [b478ee5] Avoid overloading on mipsel. + Add mipsel to debian/patches/32bit-avoid-overloading.patch + * [85eb6e9] Also build jerasure with softfp on armel. + + -- Bernd Zeimetz Thu, 26 Dec 2019 16:03:51 +0100 + + ceph (14.2.4-3) unstable; urgency=medium + + [ Bernd Zeimetz ] + * [f3f47f5] CI: disable extra-long running tests. + + [ Steve Langasek ] + * [9794fc4] Drop uninstallable and unneeded server binaries on i386. + (Closes: #947156) + + [ Bernd Zeimetz ] + * [6c2993f] Merge tag 'debian/14.2.4-0ubuntu3' into debian/unstable + * [0c5b41f] Use a tracker.d.o list instead of a closed one. (Closes: #760538) + * [d95db97] Try to build with --max-parallel=1 on slow arches. + We run into out-of-memory errors again. + * [e8d9e63] Use -mfloat-abi=softfp on armel for NEON instructions. + And again, that patch went missing somewhere. + Taken from + https://salsa.debian.org/ceph-team/ceph/commit/fa7d0d84f736d0b8450572f3192a43ff7b3252c4 + + -- Bernd Zeimetz Tue, 24 Dec 2019 13:03:45 +0100 + + ceph (14.2.4-2) unstable; urgency=medium + + [ Thomas Goirand ] + * [4b2327d] Add a python3-ceph metapackage. + + [ Bernd Zeimetz ] + * [dbc7d2f] Add lintian override for empty python3-ceph package. + * [5381390] Remove -en from description. + We actually want to have a description in the changes file... + * [4a57f31] Make python3-ceph dependencies binNMU safe + + -- Bernd Zeimetz Thu, 28 Nov 2019 09:43:37 +0100 + + ceph (14.2.4-1) unstable; urgency=medium + + * Uploading 14.2.4 to Debian. + (Closes: #936282, #943961, #940854, #942733) + * Adding missing sources (two.js, bootstrap 3.3.4) + * ceph-mon.postinst missed the interpreter + * Add missing dependency on python3 + * ignore lintian errors about minified js with shipped sources + * Radowgw uses a systemd template, override lintian. + * libcephfs-jni: rpath to java libraries needed. + Add lintian override. + * Remove .pc folder from debian folder. + * Adding myself to Uploaders + * Merging the work done in Ubuntu. + + [ Dariusz Gadomski ] + * d/p/issue37490.patch: Cherry pick fix to optimize LVM queries in + ceph-volume, resolving performance issues in systems under heavy load + or with large numbers of disks (LP: #1850754). + + [ James Page ] + * d/p/issue40114.patch: Cherry pick endian fixes to resolve issues + using Ceph on big-endian architectures such as s390x (LP: #1851290). + * New upstream release (LP: #1850901): + - d/p/more-py3-compat.patch,ceph-volume-wait-for-lvs.patch, + ceph-volume-wait-for-lvs.patch: Drop, included upstream. + - d/p/bluefs-use-uint64_t-for-len.patch: Cherry pick fix to resolve + FTBFS on 32 bit architectures. + * d/rules: Disable SPDK support as this generates a build which + has a minimum CPU baseline of 'corei7' on x86_64 which is not + compatible with older CPU's (LP: #1842020). + * d/p/issue40781.patch: Cherry pick fix for py3 compatibility in ceph- + crash. + + [ Eric Desrochers ] + * Ensure that daemons are not automatically restarted during package + upgrades (LP: #1840347): + - d/rules: Use "--no-restart-after-upgrade" and "--no-stop-on-upgrade" + instead of "--no-restart-on-upgrade". + - d/rules: Drop exclusion for ceph-[osd,mon,mds] for restarts. + + [ Jesse Williamson ] + * d/p/civetweb-755-1.8-somaxconn-configurable*.patch: Backport changes + to civetweb to allow tuning of SOMAXCONN in Ceph RADOS Gateway + deployments (LP: #1838109). + + [ James Page ] + * d/p/ceph-volume-wait-for-lvs.patch: Cherry pick inflight fix to + ensure that required wal and db devices are present before + activating OSD's (LP: #1828617). + + [ Steve Beattie ] + * SECURITY UPDATE: RADOS gateway remote denial of service + - d/p/CVE-2019-10222.patch: rgw: asio: check the remote endpoint + before processing requests. + - CVE-2019-10222 + - Closes: #936015 + + [ James Page ] + * New upstream release. + * d/p/fix-py3-encoding-fsid.patch: Drop, no longer required. + * d/p/pybind-auto-encode-decode-cstr.patch: Drop, reverted upstream. + * d/p/fix-py3-encoding-fsid.patch: Cherry pick correct fix to resolve + FSID encoding issues under Python 3 (LP: #1833079). + * d/p/pybind-auto-encode-decode-cstr.patch: Cherry pick fix to ensure + that encoding/decoding of strings is correctly performed under + Python 3 (LP: #1833079). + + * New upstream release. + * d/p/misc-32-bit-fixes.patch: Drop, included upstream. + * d/p/py37-compat.patch: Drop, included upstream. + * d/p/collections.abc-compat.patch: Drop, included in release. + * d/p/*: Refresh. + * d/*: Re-sync packaging with upstream for Nautilus release. + * d/control,ceph-test.*,rules: Disable build of test binaries, drop + ceph-test binary package (reduce build size). + * d/control,rules: Use system boost libraries (reduce build time). + * d/control: Add dependency on smartmontools, suggest use of nvme-cli + for ceph-osd package. + * d/p/32bit-*.patch: Fix misc 32 bit related issues which cause + compilation failures on armhf and i386 architectures. + * d/control: Add Breaks/Replaces on ceph-common for ceph-argparse to + deal with move of Python module. + + * New upstream release (LP: #1810766). + * d/p/*: Refresh. + + * d/p/more-py3-compat.patch: Add more py3 fixes. + + * d/p/more-py3-compat.patch: Misc Python 3 fixes in ceph-create-keys. + + * d/tests/python-ceph: Fix python3 test support resolving + autopkgtest failure. + + * New upstream point release. + * d/p/*: Refresh. + * d/control,python-*.install,rules: Drop Python 2 support. + * d/tests: Update for Python 2 removal. + * d/p/misc-32-bit-fixes.patch: Update type of rgw_max_attr_name_len, + resolving SIGABRT in radosgw (LP: #1805145). + * d/p/boost-py37-compat.patch: Fix compilation issue with boost + imports conflicting with ceph's assert.h header. + * d/p/collections.abc-compat.patch: Selective cherry-pick of upstream + fix for future compatibility with Python 3.8, avoiding deprecation + warnings under Python 3.7. + + * d/ceph-mds.install: Install missing systemd configuration + (LP: #1789927). + + * Re-instate 32bit architectures. + - d/control: Switch back to linux-any + - d/p/misc-32-bit-fixes.patch: Misc fixes for compilation + failures under 32 bit architectures. + - d/rules: Disable SPDK integration under i386. + * Repack upstream tarball, excluding non-DFSG sources (LP: #1750848): + - d/copyright: Purge upstream tarball of minified js files, which + are neither shipped in binaries or required for package build. + - d/watch: Add dversionmangle for +dfsg\d version suffix. + * d/control,rules: Drop requirement for gcc-7 for arm64. + * d/ceph-osd.udev: Add udev rules for sample LVM layout for OSD's, + ensuring that LV's have ceph:ceph ownership (LP: #1767087). + + * d/copyright,source.lintian-overrides: Exclude jsonchecker component + of rapidjson avoiding license-problem-json-evil non-free issue. + * New upstream point release. + * d/control: Remove obsolete X{S}-* fields. + + * New upstream release. + * Sync with changes in upstream packaging: + - d/*.install,rules: Use generated systemd unit files for install + - d/ceph-test.install: Drop binaries removed upstream. + * d/p/*: Refresh and drop as needed. + * d/*.symbols: Refresh for new release. + * d/rules,calc-max-parallel.sh: Automatically calculate the maximum + number of parallel compilation units based on total memory. + * d/control: Drop support for 32 bit architectures. + * d/control: Update Vcs-* fields for Ubuntu. + * d/control: Drop min python version field. + + -- Bernd Zeimetz Mon, 18 Nov 2019 14:18:10 +0100 + ++>>>>>>> becb10737 ceph (12.2.11+dfsg1-2.1) unstable; urgency=medium * Non-maintainer upload. diff --cc debian/patches/series index 456a777db,e7a6ce601..e1396eb54 --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,19 -1,16 +1,17 @@@ - ## Backported / Upstream - 0010-fix-various-spelling-errors.patch - 0013-remove-ceph.com-ref-to-favicon.patch - - ## Debian - virtualenv-never-download.patch - libatomic.patch - rocksdb-fallthrough-i386.patch - 0001-CoreLocalArray-class.patch - 0002-core-local-array-type-conversions.patch - 0003-Core-local-statistics.patch - fix-var-run-perms-sysvinit.patch - # Ubuntu: FTBFS on armhf - armhf-ftbfs.patch - boost-1.67-fixes.patch - softfp-armel.patch - 32-bit-ftbfs.patch - radosgw-linkage-without-beast.patch + update-java-source-target-flags.patch + disable-crypto.patch + 32bit-avoid-overloading.patch + 32bit-avoid-size_t.patch + # Ubuntu: civetweb max connections + civetweb-755-1.8-somaxconn-configurable_conf.patch + civetweb-755-1.8-somaxconn-configurable.patch + civetweb-755-1.8-somaxconn-configurable_test.patch + # Upstream: py3 + # Upstream: 32bit + bluefs-use-uint64_t-for-len.patch + fix-clang-build.patch + debian-armel-armhf-buildflags.patch + fix-bash-completion-location + 32466.patch-1 + 32466.patch-2 +detect-raspbian.diff diff --cc install-deps.sh index c8f972c9b,8f671db14..c12ca2d77 --- a/install-deps.sh +++ b/install-deps.sh @@@ -113,18 -257,34 +257,34 @@@ if [ x$(uname)x = xFreeBSDx ]; the exit else + for_make_check=false + if tty -s; then + # interactive + for_make_check=true + elif [ $FOR_MAKE_CHECK ]; then + for_make_check=true + else + for_make_check=false + fi source /etc/os-release - case $ID in + case "$ID" in - debian|ubuntu|devuan) + debian|ubuntu|devuan|raspbian) echo "Using apt-get to install dependencies" - $SUDO apt-get install -y lsb-release devscripts equivs - $SUDO apt-get install -y dpkg-dev gcc + $SUDO apt-get install -y devscripts equivs + $SUDO apt-get install -y dpkg-dev case "$VERSION" in *Trusty*) - ensure_decent_gcc_on_deb 4.8 + ensure_decent_gcc_on_ubuntu 8 trusty ;; *Xenial*) - ensure_decent_gcc_on_deb 5 + ensure_decent_gcc_on_ubuntu 8 xenial + install_boost_on_ubuntu xenial + ;; + *Bionic*) + install_boost_on_ubuntu bionic + ;; + *) + $SUDO apt-get install -y gcc ;; esac if ! test -r debian/control ; then diff --cc qa/workunits/ceph-helpers-root.sh index d6fd43bf7,65c2fc3b9..4efbad6d0 --- a/qa/workunits/ceph-helpers-root.sh +++ b/qa/workunits/ceph-helpers-root.sh @@@ -24,15 -34,14 +34,14 @@@ function install() } function install_one() { - case $(lsb_release -si) in - Ubuntu|Debian|Devuan|Raspbian) - sudo apt-get install -y "$@" + case $(distro_id) in - ubuntu|debian|devuan) ++ ubuntu|debian|devuan|raspbian) + sudo env DEBIAN_FRONTEND=noninteractive apt-get install -y "$@" ;; - CentOS|Fedora|RedHatEnterpriseServer) + centos|fedora|rhel) sudo yum install -y "$@" ;; - *SUSE*) + opensuse*|suse|sles) sudo zypper --non-interactive install "$@" ;; *) diff --cc qa/workunits/rados/test_envlibrados_for_rocksdb.sh index e136628d1,1360f6dfe..5ee64dbd9 --- a/qa/workunits/rados/test_envlibrados_for_rocksdb.sh +++ b/qa/workunits/rados/test_envlibrados_for_rocksdb.sh @@@ -38,15 -18,31 +18,31 @@@ CURRENT_PATH=`pwd ############################################ # install prerequisites # for rocksdb - case $(lsb_release -si) in - Ubuntu|Debian|Devuan|Raspbian) - install g++-4.7 libgflags-dev libsnappy-dev zlib1g-dev libbz2-dev librados-dev + case $(distro_id) in - ubuntu|debian|devuan) ++ ubuntu|debian|devuan|raspbian) + install git g++ libsnappy-dev zlib1g-dev libbz2-dev libradospp-dev + case $(distro_version) in + *Xenial*) + install_cmake3_on_xenial + ;; + *) + install cmake + ;; + esac + ;; + centos|fedora|rhel) + install git gcc-c++.x86_64 snappy-devel zlib zlib-devel bzip2 bzip2-devel libradospp-devel.x86_64 + if [ $(distro_id) = "fedora" ]; then + install cmake + else + install_cmake3_on_centos7 + fi ;; - CentOS|Fedora|RedHatEnterpriseServer) - install gcc-c++.x86_64 gflags-devel snappy-devel zlib zlib-devel bzip2 bzip2-devel librados2-devel.x86_64 + opensuse*|suse|sles) + install git gcc-c++ snappy-devel zlib-devel libbz2-devel libradospp-devel ;; *) - echo "$(lsb_release -si) is unknown, $@ will have to be installed manually." + echo "$(distro_id) is unknown, $@ will have to be installed manually." ;; esac